All tests passing except values