More tests and functionality