Refined the test based on results from AM