Rearranged tests and added the possibility to skip tests