Unittest

Split one unittest into multiple test functions (is more what nose likes)