Updatest tests to reflect changes in design