Adding tests and creating metrics