LUN-368-tests -- reverted due to some django 1.5 requirements issues