#69 Tests fixed