completely overhauls tests/fixtures so the results are more informative

Also adds `originalLayout` variable to context