a) Split some test cases into two. Rule of testing: Each test case
should only test 1 thing. 

b) Replaced some try/catch with jUnit annotation: 
@Test(expected = IllegalArgumentException.class) 
(I will replace a few remaining try/catch in subsequent commits) 

Patchset 4:
- removed redundant 'fail()'
- I will go through all try/catch jUnit tests and fix those up in
subsequent commit. (Too many merge conflict with subsequent patch
otherwise).

Change-Id: I051b6651398c9f5640b22f6f06f3efd2a0c46a83 
Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>