Moving to src main test structure