Simplified two tests