make tests work
simplify