Moving tests out of main lib directory