Started to add tests for am