reorganize tests, start using pytest