Fixing merge issues
ignoring tests that were broken before merge
updating pom to 0.9 snapshot