Refactored all tests to work with new code
Moved lib2 to replace old lib folder
Remove extend
Split code to separate modules
Extend error reporting