Split tests, cleaned up modules, plus some extra tests and work in progress for rvm