Added tests

Fixed access modifiers on classes