Fix some errors
Working on fixing unit tests
Working on fixing unit tests
Automated merge with ssh://bitbucket.org/sean111/evofw