Increase test coverage

@LukasReschke mind reviewing? ^_^