Added first round of tests, also included junit and mockito