Added programming tests and incorporated it into system