more tests built out and split into different files