continue tests and minor fixes