Finished testing for milestone 2