Fix some imports, remove the JCR Property based handling class and Test