First tests. Loads of changes