Update tests to reflect new project structure
Begin to implement push with new project structure