Get some of the older tests up to date

[0xNeshi]

Wanted to remove contract-address.json updates from tests, so went ahead and did a quick cleanup.

Explanation of the solution

• focused on tests I created (I understand those best, so was very fast)
• remove use of actual deploy scripts
• use smock instead of dummy contracts
• general cleanup where appropriate

Instructions on making this work

• run yarn or yarn install to install npm dependencies
• run yarn test to verify all tests still pass