finished initial tests and added metrics