Fixed test 1.
Switched test 5 to use Layout instead of Layout1.
Fixed issue with slight layout differences.