refactored test frameworks ftw