Moved tests to be _test.go of relevant file