moar fixed tests