Add additional tests and improvements