More tests and fix . operator not being parsed in right order.