Refactoring Feather, started test suite.