Dev/demandspike2louzar

format code and make unit test more short