Remove unwanted styling
Remove pending from test
Merge branch 'development' into development-work