Tests

Changing tests as requested in #79, and general cleanup of installation/testing scripts.