WIP getting structure together for tests for each types