added handling for time worked for #222
updated existing tests to work with new grade calculation for #222