Commented out tests that weren't working and implement tests for lazy evaluation