Added more eval tests and tidy up