Fix wrong merging
Delete test tests from unittest file
Stupid PEP8