Clean up unit tests; update README