Updating tests. Fix Constants. Start work on type extensions