Changed Assert classes to org.junit. 
Added more tests.