Rewrite

Goals Testability and tests