a little reorganizing and providing a simple test_all