GTest assertion for less or equals
Couple of file renames for consistency