Clean up component
Update tests