added tests and updated path