Move post_load actions to constructor, few more unit tests