Added last cases; remove test_samples test because some are failing tests