refactored test to make stronger, implemented dynamic links and patched various other tests that make use of the layout