simplified tests, added more logging