General improvements
Almost done
Test files added