Update tests and beautify