First attempt at getting trunk tests to pass