Small fixes
Made a smaller setup file for testing