Adding test fixes. Setting up maven to run automated tests