Added some edge case tests