Add additional tests, plus failing tests