JUnit 2.1

Added tests