Re-worked tests