Simplified and merged tests