Changed directory name; refactored tests