get rid of *_self methods - some tests are still needed