Modified tests and other minor changes