Add tests and update to schema 1.03