Removed old test environment
Updated unit tests