laziness tests
fix laziness issues (there were many)