Remove unnecessary tests + Fix constructor args