Finished off non-complicated tests.

Removed ConvertMethodToProperty - it's pointless and would be very
difficult to actually do.