Added tests and healthcheck