Rewrote tests after code re-org