nice
fix tests, remove code