Feature/tests toolbar

See #313