WIP on working in tests