Now uses account instead of file
Added ?TRACE macro for debugging tests