Converted several *slow* functional tests into *fast* unit tests with the same coverage.