New tests added and old tests refactored.
Documentation supplemented.