Some clean ups, tests and Readme updates