Updated readme, cleaned up tests