rewrite test descriptions, update layout specs