Add additional tests and fix some