Finished junit stuff