Updating tests, schema and pom