Add Master Assets API methods and tests. Also cleaned up some incomplete tests