updated roster and added tests