Fixed some tests
Some minor changes
decimals
Tests
pre push
pre push