Refactor Logic Spec's

Hi, as mentioned in previous PR here is updated version of logic specs :) 

It looks to be simpler, also it's  covered with specs, let me know what do you think :)