Switch to Java 7 NIO
Add additional unit tests