Re-enable some basics tests.
Merge pull request #3 from commandoline/master

Re-enable some basics tests.