Made tests much simpler... I hope