ADD: Custom Stategies, Unit Tests, Small Fixes