Allow running tests with "./setup test"
Remove junk
Use stable version