More tests, and ability to nullify parameters