Improved tests.py, work in progress
Fixed conflicts in tests.py