Add pending tests, fix some types