WIP fix rebase conflicts
Change namespace of test class