cleanup
modified module dependencies resolution - behaviour implementation is now considered a dependency;
modified dependencies resolution tests accordingly;