Implemented new tests, simplified paths, corrected rdoc documentation