junit and fixes