Finished work and writing tests.....