Add some cleanups, Tests now run in real environment