Fixed problems in the jUnit tests, coverage is pretty bad