forum tests commit + refactoring