Cleanup, added test cases for string/bv I/O