Added some missing tests