Added some last tests