#7 done without fixed tests