Adding more faked data to the unit tests. Fixing some rules in the dogma