Modified tests, added docs