Finished layout and routs, added more tests