fixed tests. moar tests