New test system

Maybe it would be better to pull this into new branch at first.