caching stuff
updated tests for cloud instance