- Fixed some unit tests
- makefile parsing now handles TESTENVOPTIONS