Added better infix + tests