First working version of fixed set
Improved unit tests