Tests

Changing tests as requested in #79, and general cleanup of installation/testing scripts. 
@jar398, here's the line in question