making tests pass and adding tests for expression feature which I spiked