Revision 5

Revision 5 is identical to revision 4 with improved test coverage.