Fixed code style and naming
Added baselines for new tests