fixes for broken test