Fix bundle/server tests