added abilities; rearranged tests