Updated evaluation tests
Few more evaluation tests
Some more cleanup before merging to master