Added some more tests :construction_worker: