Update tests to follow consistent coding style