I need to implement tests, there are none yet which should get fixed