#27 - refactor - tests should not be dependent on html structure. remove need for fixtures.
#27 - rename for clarity.