Fixed assertions in unit tests.

Also cleaned up project file.