Create test to be used in nagios
Fix merge issues