Various test, before refactoring
Various test, before refactoring w/ new files