minor fixes and unfinished serverlessTest