Update examples to test out a few new scenarios
Move test to correct package