minor, avoid NPE
remove unused classes
add expectException to GivenWhenTestFixture