refactored test fixture => as good as honey now