fixes for testing purposes