Add better support for testing