More tests are working... still have issue.