ehm, fixed tests, sortof