Fixes, abstract classes, new test file