fixes and unit tests
new files & fixes