Updates to test-like samples to allow for easier testing