Remove 1 sec timeout used in testing
Fix namespace case that could cause class lookup failure