test/ cleaned up behavior