Refactor rake tasks for acceptance tests Address PR comments
Rake by default imports all .rake files in the rakelib dir, so we can use that rather than doing our own import loop.