Removing oracle, adding zeus for tests and cleaning up whitespace