Fixed test. Working on #50 #51