added unix tests
Remove clutter.