Updates to tests and readme