Updated readme, fixed the tests a bit.