Additional tests and code nit