Tweaked main.cpp / disabled tests