component testing and small bug fix