Add additional tests and fix two minor issues:

* Line Numbers of callable typehinted parameters were wrong when declared on new line
* Constant scalar expressions in classes were not recognized.