tests and small changes