bring in tests, fix names