Tests per Pavel's suggestions