Finished and added test