change test_basic to self-contained tests
Merge pull request #781 from mfalesni/self_contain_basic_tests_control

change test_basic to self-contained tests