Separated some tests

References #285