Fix failing swingtime tests