Fixed tests so that test content is actually used