Updated readme, fix tests to be stricter and not prone to semi-random failures