Fixed error related to wrong env. Removed obsolete code. Added new test file.