refactored tests in multiple files, its still primitive setup but should get along for some time until tests become the real focus