Removed test logic