joachimmetz Worked on tests and code clean up