Fixed shit
Added useless unit tests