Cleaned up testing and abstracted test stubs