fixed codingstyle, removed outcommented, long disabled, test