Dashboard cleanup
Integration test fix