Add More Tests

# Status: Not ready to merge yet.
### First round of #728