added and refactored test suits