Finished with junit testing