Re-factored test suite to comply with new API