upgraded to flexbox mixin
Code cleanup and added two new unit tests.