Better readability in tests and minor cleanup
Removed unsued code.
Merge pull request #6 from iapain/embed

Embed (unused code removed)