Fixed scenarios, added Dashboard basic functionality and tests