wip on adding tests at higher level, some not right