feat: add mock server and minor improvements