More tests and some updates