Added version 2 tests