removed redundant procedures and started to make some tests for those that are new