Bye bye Int16, hello new tests