Clean up setup
Test now passing in github repo