Initial test Ok, code style corrections.