Added tests

@JBlaak