Finalized tests and bug fixes
Fixed README