Amended test layout