Small fixes, add stage 3 tests