Made other functions than actions protected.
Test fixes