Updates Gmefile and removes dupliaction of load files and improves test_helper.rb