Added path tests
Updated klass loading