removed some test functionality
replaced a deprecated method
prepared for linux