Fix to standarts and add tests