WIP - cleaned up some old tests and added new ones

The old were RPC tests that I deleted the code for
the new were adding proper tests for api resources