get tests working
reverted norman's fix