added tests for milestones 2 and 3