minor import fixes and added a tests directory