Test almost complete, integration still requires refactoring