Updated tests
Updated project file
Removed lift from generate.sh script
Updated generate.sh script