Refactor of tests
Updated using new test style and fixed display bug.