More version 00 support with tests.