OK - last test needed but it should be right