Handle calls as properties, and use extend() inline style declarations
more test updates