Moved testing to appropiate folders