Added missing test class and fixes small mistakes.