Added tests and fixed a NullPointerException identified by those tests.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1518142 13f79535-47bb-0310-9956-ffa450edef68