BUG: Fixed tests