Tests added, formatting