fixed failing tests and added test layout