Finished up more of test but something is broken =_=