Fold tests into one and add stubs for rest of AR tests