edited layouts, edited tests