updates to tests and added feature