updated tests and minor updates