Added more tests, update readme, and fixed up original colors