fix broken unittests
simplify test