tests back and updated to new layout