fixed tests to not use code from 'aoi'
preliminary work towards automatic unit testing