Tests and code style changes;