Finished single instance and added test set