Add more tests and make solaris pass
Merge pull request #66 from hunner/make_sol_work

Add more tests and make solaris pass