Added throws to test methods
Upgraded to jUnit 4