Added testacular support, moved some stuff around