fix(tests): WIP on fixing tests