Added new methods and tests for these: basename, dirname