Fixed deprecated application context.
Remove unused test classes.
Last commit of the day. Not working fully.