Cleaned up junit calls