Another iteration of code cleaning
Switched to org.junit.Assert