Added test for dashboard helper, cleanup strays