Copy 03 to 04
Add integration tests