Prevent duplicate require calls
Cleanup whitespace
Added proper tests
Merge branch '4-prevent-duplicate-require-calls'