APU work + some bad tests