Added some tests and fixed problems with "require"
Resolved conflicts