testing module added
minor refactoring