Finished all functionalities, cleaning up tests