added amp tests
Fixed merging issue