Added a couple tests