tests and minor updates