Making some last tweaks and fixing some acc tests