Fixed bugs, added author tests