fixes and some tests
updated tests to show results