Fixes: for styles and tests