Change to junit 4.11 and add hamcrest for matchers. Add test to match for instances of class.