Fixed tests. Seperate main and runners