fixing minitests and most specs