New test framework
Updated README and code cleanups