address yoric's review comments for tests