Add some surefire unit tests and fixing some errors