Added tests, removed devices method.