Testing

Merging testing into dev; Only added MockNetwork / MockRequest since last merge, tests are still broken due to networking errors but everything builds without error.