Organize imports, reformat code, added arrange, act, assert comments