Fixed unit tests that broke from sample improvements