Add more tests for AMEDAS