Milestone 4 several test cases working