Added basic test units