Remove temp test files
Refactor tests
Remove static test files
Cleaning up temp files
Initial commit of cleaned-up dev branch