adding @Test(expected ) test
small refactor
Merge branch 'team10'