Added several new tests to increase the code coverage up to 81%.