Updated tests, added achievement tests, updated observer