Most of refactoring done. Started cleaning up tests