Added collision/cleaned up some bad python code/added tests