Update tests and ensure full coverage