Second Commit with new tests with a couple errors