Moved sim.py stuff to the right place
byebye sim.py
Split tests into multiple files
New test files
Still broken, but working on tests.