remove warnings, get tests to pass