Clean up

- Cleaned up the tests by consolidating some duplicated code (namely the keystone version data) and removing some code commented out