add some tests and implementations for 02 and 03