cleanup
revamp test environment
lease weight on spec_helper