Added several tests, ensured they pass