Remove pending tests, add basic tests