Added more adts and tests. Hopefully works now.