more dirty code.. 13 err in tests, fixing