wip test and some name refactors