Added tests and moved local tests