fixing tests, adding dashboard
fixing merges