be consistent on information returned normalize 'return functions' fix unit test add a bit more context on some failures