Added tests and fixed up pathing issues