Fixed README.md and cwd w/ expand. Added some tests

This should fix issues #8 and #6. also includes #7 which can be closed.