Made visual "tests" somewhat more modular, WIP