Merge pull request #209 from josemduarte/master

Making sure that tests in aa-prop run. They weren't running at all