Junit finished

reviewed by Kasper, Simon and Chris